merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:54 +0000 (14:19 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:54 +0000 (14:19 +0900)
commit3565139946c18575d834499eaf68d246b1f538ec
tree62e33ca6c488a7fdc71bb2599cb5c3c196e6a4d2
parent95dcd69ad6bd5b6172d449bedb44826dd9c16530
parent4755e11a8fd229c469351807b0b36cfcf6d90c7d
merge trunk